Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk

author Yuuki Harano <masm+github@masm11.me>

Thu, 6 May 2021 12:47:23 +0000 (21:47 +0900)

committer Yuuki Harano <masm+github@masm11.me>

Thu, 6 May 2021 12:47:23 +0000 (21:47 +0900)
author Yuuki Harano <masm+github@masm11.me>
Thu, 6 May 2021 12:47:23 +0000 (21:47 +0900)
committer Yuuki Harano <masm+github@masm11.me>
Thu, 6 May 2021 12:47:23 +0000 (21:47 +0900)
diff --cc lisp/loadup.el
Simple merge
diff --cc lisp/startup.el
Simple merge
diff --cc src/frame.c
Simple merge
author	Yuuki Harano <masm+github@masm11.me>
	Thu, 6 May 2021 12:47:23 +0000 (21:47 +0900)
committer	Yuuki Harano <masm+github@masm11.me>
	Thu, 6 May 2021 12:47:23 +0000 (21:47 +0900)
		1	2
lisp/loadup.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/startup.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/frame.c	patch \|	diff1 \|	diff2 \|	blob \| history